From: Mathieu Malaterre <malat@debian.org>
Date: Fri, 21 Mar 2025 11:34:51 +0000 (+0100)
Subject: d/control: relax dependency on dcmtk-data. Closes: #1098944
X-Git-Tag: archive/raspbian/3.6.9-6+rpi1^2~24
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Se/%22http:/www.example.com/cgi/%22https:/%22Se?a=commitdiff_plain;h=57a577d74dcfecb487f2a1559edcfa03bab51827;p=dcmtk.git

d/control: relax dependency on dcmtk-data. Closes: #1098944
---

diff --git a/debian/control b/debian/control
index d9ca3d0f..fa8eaed3 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Description: OFFIS DICOM toolkit data files
 Package: libdcmtk19
 Architecture: any
 Section: libs
-Depends: dcmtk-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: dcmtk-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: same
 Description: OFFIS DICOM toolkit runtime libraries
  DCMTK includes a collection of libraries and applications for examining,
diff --git a/debian/dcmtk-data.install b/debian/dcmtk-data.install
index 91277687..7045a559 100644
--- a/debian/dcmtk-data.install
+++ b/debian/dcmtk-data.install
@@ -1,3 +1,3 @@
-usr/share/dcmtk-3.6.9/*.dic
-usr/share/dcmtk-3.6.9/csmapper/
-usr/share/dcmtk-3.6.9/esdb/
+usr/share/dcmtk/*.dic
+usr/share/dcmtk/csmapper/
+usr/share/dcmtk/esdb/
diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples
index 6c84575f..25315700 100644
--- a/debian/dcmtk.examples
+++ b/debian/dcmtk.examples
@@ -1,2 +1,2 @@
-usr/share/dcmtk-3.6.9/wlistdb
-usr/share/dcmtk-3.6.9/wlistqry
+usr/share/dcmtk/wlistdb
+usr/share/dcmtk/wlistqry
diff --git a/debian/dcmtk.install b/debian/dcmtk.install
index 03a21b41..3867465e 100644
--- a/debian/dcmtk.install
+++ b/debian/dcmtk.install
@@ -1,8 +1,8 @@
 etc/dcmtk/*
 usr/bin/*
-usr/share/dcmtk-3.6.9/*.css
-usr/share/dcmtk-3.6.9/*.dump
-usr/share/dcmtk-3.6.9/*.lut
-usr/share/dcmtk-3.6.9/dcm2xml.dtd
-usr/share/dcmtk-3.6.9/dsr2xml.xsd
-usr/share/dcmtk-3.6.9/dumppat.txt
+usr/share/dcmtk/*.css
+usr/share/dcmtk/*.dump
+usr/share/dcmtk/*.lut
+usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dsr2xml.xsd
+usr/share/dcmtk/dumppat.txt
diff --git a/debian/patches/remove_version.patch b/debian/patches/remove_version.patch
index 096ae1d8..05faf03a 100644
--- a/debian/patches/remove_version.patch
+++ b/debian/patches/remove_version.patch
@@ -1,19 +1,22 @@
 Description: Remove version
 Author: Mathieu Malaterre <malat@debian.org>
 Forwarded: not-needed
-Last-Update: 2023-11-06
+Bug-Debian: https://bugs.debian.org/1098944
+Last-Update: 2025-03-21
 
 
 Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
 ===================================================================
 --- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
 +++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -195,7 +195,7 @@ else()
+@@ -195,8 +195,8 @@ else()
  
    # Modify the installation paths for configuration files, data files and documents
    # by adding a subdirectory with the DCMTK name and version number
 -  set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+-  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 +  set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_SYSCONFDIR}/dcmtk")
-   set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
++  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/dcmtk")
    set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
  
+   # These variables are defined as macros in osconfig.h and must end with a path separator
diff --git a/debian/tests/run-unit-test b/debian/tests/run-unit-test
index 2874c778..97dcb126 100644
--- a/debian/tests/run-unit-test
+++ b/debian/tests/run-unit-test
@@ -13,7 +13,7 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
 fi
 
 cp -a /usr/lib/python3/dist-packages/pydicom/data/test_files/CT_small.dcm "${AUTOPKGTEST_TMP}"
-cp -a /usr/share/dcmtk-3.6.9/dicom.dic "${AUTOPKGTEST_TMP}"
+cp -a /usr/share/dcmtk/dicom.dic "${AUTOPKGTEST_TMP}"
 
 
 export DCMDICTPATH=${AUTOPKGTEST_TMP}/dicom.dic